From wens at kernel.org  Mon Jul  1 01:22:35 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Mon, 1 Jul 2024 16:22:35 +0800
Subject: [PATCH v2 2/4] wireless-regdb: Update regulatory info for Jordan
 (JO) for 2022
In-Reply-To: <20240624025623.6021-2-pkshih@realtek.com>
References: <20240624025623.6021-1-pkshih@realtek.com> <20240624025623.6021-2-pkshih@realtek.com>
Message-ID: <CAGb2v651jAs9g-UqCeoPgmiigpNDTVY_itvhwq9VBHPuzfdPRg@mail.gmail.com>

On Mon, Jun 24, 2024 at 10:56?AM Ping-Ke Shih <pkshih at realtek.com> wrote:
>
> The Hashemite Kingdom of Jordan, Telecommunications Regulatory Authority
> issued pursuant to the provisions of Articles (12A) and (22) of the
> Telecommunications Law No. 31 of 1995, as amended. [1]
>
> The effective radiated power (EIRP) of devices used in local radio computer
> networks must not exceed the following values:
>
>  - 2400-2483.5 MHz: 100 milliwatts (20 dBm)
>  - 5150-5350 MHz: 200 milliwatts (23 dBm), (ETSI: 20 dBm, DFS)
>  - 5470-5725 MHz: 1 watt (30 dBm), (ETSI: 27 dBm, indoor only, DFS)
>  - 5725-5875 MHz: 200 mW (23 dBm), (ETSI: indoor only)
>  - 5925-6425 MHz:
>    * 25 milliwatts (14 dBm) (for outdoor and portable devices)
>    * 200 milliwatts (23 dBm) (for devices operated indoors only)
>  - 57-71 GHz: 10 W (40 dBm)
>
> Follow ETSI EN 301 893 [2], which specifies reduced power limit of
> 20 and 27 dBm for the range 5150-5350 and 5470-5725 respectively for
> devices that don't implement TPC; and classifies the 5470 - 5725 MHz and
> 5725 - 5875 MHz ranges as indoor use only; and DFS is required for bands
> 5250 - 5350 Mhz and 5470 - 5725 Mhz. (Add these rules followed rules of
> [1] with "ETSI:" annotation)
>
> [1] https://trc.gov.jo/EchoBusV3.0/SystemAssets/PDF/RSMD/cb9f9a83-43a6-4e66-8432-6e02ecaf465b_RLAN%20Arabic%20%20Final%20-%20clean%20with%2057-71%20GHz.pdf
> [2] https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
>
> Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
> ---
> v2:
>   - Follow ETSI EN 301 893 to modify limits, and add description in commit
>     message.
>   - add 57-71 GHz
> ---
>  db.txt | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/db.txt b/db.txt
> index 61c46186919e..60343a745ecf 100644
> --- a/db.txt
> +++ b/db.txt
> @@ -957,10 +957,16 @@ country JM: DFS-FCC
>         (5490 - 5730 @ 160), (24), DFS
>         (5735 - 5835 @ 80), (30)
>
> +# Source:
> +# https://trc.gov.jo/EchoBusV3.0/SystemAssets/PDF/RSMD/cb9f9a83-43a6-4e66-8432-6e02ecaf465b_RLAN%20Arabic%20%20Final%20-%20clean%20with%2057-71%20GHz.pdf
> +# ETSI EN 301 893: https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
>  country JO: DFS-JP

Change this to DFS-ETSI given that the official regulations just point
to ESTI for details.

> -       (2402 - 2482 @ 40), (20)
> -       (5170 - 5250 @ 80), (23)
> -       (5735 - 5835 @ 80), (23)
> +       (2400 - 2483.5 @ 40), (20)
> +       (5150 - 5350 @ 80), (20), DFS

Per ETSI regulations, DFS is only required for 5250 - 5350. Please split
this into two rules. And please add AUTO-BW to both.

Also, looking at the official regulations again, I believe it is worded
in a way that does not require TPC for 5150 - 5350. So please raise the
limit back up to 32 dBm.


Thanks
ChenYu

> +       (5470 - 5725 @ 80), (27), DFS, NO-OUTDOOR
> +       (5725 - 5875 @ 80), (23), NO-OUTDOOR
> +       (5925 - 6425 @ 320), (23), NO-OUTDOOR
> +       (57000 - 71000 @ 2160), (40)
>
>  # Source:
>  # https://www.soumu.go.jp/main_content/000635492.pdf
> --
> 2.25.1
>


From wens at kernel.org  Mon Jul  1 01:55:01 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Mon, 1 Jul 2024 16:55:01 +0800
Subject: [PATCH v2 2/4] wireless-regdb: Update regulatory info for Jordan
 (JO) for 2022
In-Reply-To: <CAGb2v651jAs9g-UqCeoPgmiigpNDTVY_itvhwq9VBHPuzfdPRg@mail.gmail.com>
References: <20240624025623.6021-1-pkshih@realtek.com> <20240624025623.6021-2-pkshih@realtek.com>
 <CAGb2v651jAs9g-UqCeoPgmiigpNDTVY_itvhwq9VBHPuzfdPRg@mail.gmail.com>
Message-ID: <CAGb2v65aRPo3kwvUA8WZXxnbjJmGNr5OsU9=92zLzCUSB8MzSQ@mail.gmail.com>

On Mon, Jul 1, 2024 at 4:22?PM Chen-Yu Tsai <wens at kernel.org> wrote:
>
> On Mon, Jun 24, 2024 at 10:56?AM Ping-Ke Shih <pkshih at realtek.com> wrote:
> >
> > The Hashemite Kingdom of Jordan, Telecommunications Regulatory Authority
> > issued pursuant to the provisions of Articles (12A) and (22) of the
> > Telecommunications Law No. 31 of 1995, as amended. [1]
> >
> > The effective radiated power (EIRP) of devices used in local radio computer
> > networks must not exceed the following values:
> >
> >  - 2400-2483.5 MHz: 100 milliwatts (20 dBm)
> >  - 5150-5350 MHz: 200 milliwatts (23 dBm), (ETSI: 20 dBm, DFS)
> >  - 5470-5725 MHz: 1 watt (30 dBm), (ETSI: 27 dBm, indoor only, DFS)
> >  - 5725-5875 MHz: 200 mW (23 dBm), (ETSI: indoor only)
> >  - 5925-6425 MHz:
> >    * 25 milliwatts (14 dBm) (for outdoor and portable devices)
> >    * 200 milliwatts (23 dBm) (for devices operated indoors only)
> >  - 57-71 GHz: 10 W (40 dBm)
> >
> > Follow ETSI EN 301 893 [2], which specifies reduced power limit of
> > 20 and 27 dBm for the range 5150-5350 and 5470-5725 respectively for
> > devices that don't implement TPC; and classifies the 5470 - 5725 MHz and
> > 5725 - 5875 MHz ranges as indoor use only; and DFS is required for bands
> > 5250 - 5350 Mhz and 5470 - 5725 Mhz. (Add these rules followed rules of
> > [1] with "ETSI:" annotation)
> >
> > [1] https://trc.gov.jo/EchoBusV3.0/SystemAssets/PDF/RSMD/cb9f9a83-43a6-4e66-8432-6e02ecaf465b_RLAN%20Arabic%20%20Final%20-%20clean%20with%2057-71%20GHz.pdf
> > [2] https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
> >
> > Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
> > ---
> > v2:
> >   - Follow ETSI EN 301 893 to modify limits, and add description in commit
> >     message.
> >   - add 57-71 GHz
> > ---
> >  db.txt | 12 +++++++++---
> >  1 file changed, 9 insertions(+), 3 deletions(-)
> >
> > diff --git a/db.txt b/db.txt
> > index 61c46186919e..60343a745ecf 100644
> > --- a/db.txt
> > +++ b/db.txt
> > @@ -957,10 +957,16 @@ country JM: DFS-FCC
> >         (5490 - 5730 @ 160), (24), DFS
> >         (5735 - 5835 @ 80), (30)
> >
> > +# Source:
> > +# https://trc.gov.jo/EchoBusV3.0/SystemAssets/PDF/RSMD/cb9f9a83-43a6-4e66-8432-6e02ecaf465b_RLAN%20Arabic%20%20Final%20-%20clean%20with%2057-71%20GHz.pdf
> > +# ETSI EN 301 893: https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
> >  country JO: DFS-JP
>
> Change this to DFS-ETSI given that the official regulations just point
> to ESTI for details.
>
> > -       (2402 - 2482 @ 40), (20)
> > -       (5170 - 5250 @ 80), (23)
> > -       (5735 - 5835 @ 80), (23)
> > +       (2400 - 2483.5 @ 40), (20)
> > +       (5150 - 5350 @ 80), (20), DFS
>
> Per ETSI regulations, DFS is only required for 5250 - 5350. Please split
> this into two rules. And please add AUTO-BW to both.
>
> Also, looking at the official regulations again, I believe it is worded
> in a way that does not require TPC for 5150 - 5350. So please raise the
> limit back up to 32 dBm.

I meant 23 dBm.

> Thanks
> ChenYu
>
> > +       (5470 - 5725 @ 80), (27), DFS, NO-OUTDOOR
> > +       (5725 - 5875 @ 80), (23), NO-OUTDOOR
> > +       (5925 - 6425 @ 320), (23), NO-OUTDOOR
> > +       (57000 - 71000 @ 2160), (40)
> >
> >  # Source:
> >  # https://www.soumu.go.jp/main_content/000635492.pdf
> > --
> > 2.25.1
> >


From wens at kernel.org  Mon Jul  1 02:00:50 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Mon, 1 Jul 2024 17:00:50 +0800
Subject: [PATCH v2 3/4] wireless-regdb: Update regulatory info for Kenya
 (KE) for 2022
In-Reply-To: <20240624025623.6021-3-pkshih@realtek.com>
References: <20240624025623.6021-1-pkshih@realtek.com> <20240624025623.6021-3-pkshih@realtek.com>
Message-ID: <CAGb2v66WBG6FjXCvE5+sUv1YXfMxLHiQPH-st_wzCJH8XDF=mQ@mail.gmail.com>

On Mon, Jun 24, 2024 at 10:56?AM Ping-Ke Shih <pkshih at realtek.com> wrote:
>
> Communications of Authority of Kenya issued GUIDELINES ON THE USE OF
> RADIOFREQUENCY SPECTRUM BY SHORT RANGE DEVICES on JUNE 2022 [1].
> The section 5.8. covers frequency bands and technical parameters for
> non-specific short range applications and wireless access systems.
>
>  - 2400-2483.5 MHz: 2W e.i.r.p.
>  - 5150-5350 MHz: 200mW; max e.i.r.p. density of 10mW/MHz
>                   (ETSI: -6 dBm to be 17 dBm)
>  - 5470-5725 MHz: 250mW; Max mean e.i.r.p. of 1W &
>                   Max mean e.i.r.p. density of 50mW /MHz
>                   (ETSI: -6 dBm to be 18 dBm)

The database documents e.i.r.p values. So it should be 1W - 6 dBm.
The -6 dBm interpretation should be fully documented.

    1W (30 dBm) - 6 dBm = 24 dBm

This is the same as the "Limit for RF output power at the lowest power
level (PL) of the TPC range" for this particular range. See below.

>  - 5725-5875 MHz: 23 dBm/MHz; Mean e.i.r.p. of 2W in any 10 MHz band
>                   (ETSI: -6 dBm to be 17 dBm)

The original rule was probably wrong or out of date. Please update the
numbers together. The regulations say:

   Mean e.i.r.p. spectral density of 23 dBm/MHz
   Mean e.i.r.p. of 2W in any 10 MHz band

WiFi channels are at least 20 MHz. That means the nominal limit is
4W / 36 dBm with TPC. This is the same as ETSI EN 302 502. This is
the correct ETSI reference for the 5.8 GHz range. This also says

    The FWA device shall have the capability to reduce the operating
    mean EIRP level to a level not exceeding 24 dBm for ChS = 20 MHz
    and 21 dBm for ChS = 10 MHz.

And since neither this database nor Linux supports specifying TPC,
we could just reduce the power limit to 24 dBm so that the device
always conforms. This is an interpretation of the rule, and should
be properly documented, saying that this is derived from the lowest
power setting under TPC.


Thanks
ChenYu


>  - 5925-6425 MHz:
>    * LPI: 23 dBm (200 mW)
>           Mean e.i.r.p. density for in-band emissions 10 dBm/MHz
>           Indoor only
>    * VLP: 14 dBm (25 mW)
>           Mean e.i.r.p. density for in-band emissions 1 dBm/MHz
>           Indoor and outdoor use
>
> Reference ETSI EN 301 893 [2], for the 5 GHz and 5.8 GHz ranges, TPC is
> required. being able to reduce TX power by up to 6 dB. (Add this rule
> followed by [1] with annotation "ETSI:")
>
> [1] https://www.ca.go.ke/sites/default/files/2023-06/Guidelines-on-the-Use-of-Radiofrequency-Spectrum-by-Short-Range-Devices-2022.pdf
> [2] https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
>
> Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
> ---
> v2:
>   - align freq range of reference
>   - use power unit as reference
>   - -6dBm for 5 GHz and 5.8 GHz ranges
> ---
>  db.txt | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/db.txt b/db.txt
> index 60343a745ecf..648530192b75 100644
> --- a/db.txt
> +++ b/db.txt
> @@ -984,11 +984,15 @@ country JP: DFS-JP
>         # ref: http://www.arib.or.jp/english/html/overview/doc/1-STD-T74v1_1.pdf
>         (57000 - 66000 @ 2160), (10 mW)
>
> +# Source:
> +# https://www.ca.go.ke/sites/default/files/2023-06/Guidelines-on-the-Use-of-Radiofrequency-Spectrum-by-Short-Range-Devices-2022.pdf
> +# ETSI EN 301 893: https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
>  country KE: DFS-JP
> -       (2402 - 2482 @ 40), (20)
> -       (5170 - 5250 @ 80), (23)
> -       (5490 - 5570 @ 80), (30), DFS
> -       (5735 - 5775 @ 40), (23)
> +       (2400 - 2483.5 @ 40), (2000 mW)
> +       (5150 - 5350 @ 80), (17), DFS
> +       (5470 - 5725 @ 80), (18), DFS
> +       (5725 - 5875 @ 40), (17), DFS
> +       (5925 - 6425 @ 320), (23), NO-OUTDOOR
>
>  country KH: DFS-ETSI
>         (2402 - 2482 @ 40), (20)
> --
> 2.25.1
>


From wens at kernel.org  Mon Jul  1 02:17:24 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Mon, 1 Jul 2024 17:17:24 +0800
Subject: [PATCH v2 4/4] wireless-regdb: Update regulatory info for Macao
 (MO) for 2024
In-Reply-To: <20240624025623.6021-4-pkshih@realtek.com>
References: <20240624025623.6021-1-pkshih@realtek.com> <20240624025623.6021-4-pkshih@realtek.com>
Message-ID: <CAGb2v64Mnu9kOjTttonyacv5wFyhC3=2=9ZUimDSRuEwaerZ4g@mail.gmail.com>

Hi,

On Mon, Jun 24, 2024 at 10:56?AM Ping-Ke Shih <pkshih at realtek.com> wrote:
>
> MACAU SPECIAL ADMINISTRATIVE REGION OFFICE OF THE CHIEF EXECUTIVE released
> Order from the Chief Executive No. 64/2024, which wireless data
> communications equipment defined as
>
>  - 2400-2483.5MHz 200mW
>  - 5150-5350MHz   200mW
>  - 5470-5725MHz   1W
>  - 5725-5850MHz   1W
>  - 5925-6425MHz   250 mW (for indoor use)
>                   25 mW (for use in outdoor spaces)

Could you also add 60 GHz, since the new Order lists it? That would be
57 GHz - 66 GHz at 10 W.

Thanks
ChenYu

> [1] https://bo.io.gov.mo/bo/i/2024/16/despce.asp#64
>
> Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
> ---
> v2:
>    - change 5470-5725MHz to 5470-5730MHz to have 160Mhz bandwidth
>    - keep DFS flag for original ranges since it defined DFS-FCC
> ---
>  db.txt | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/db.txt b/db.txt
> index 648530192b75..c26174cb6a74 100644
> --- a/db.txt
> +++ b/db.txt
> @@ -1256,12 +1256,15 @@ country MN: DFS-FCC
>         (5735 - 5835 @ 80), (30)
>         (5925 - 6425 @ 320), (100mW)
>
> +# Source:
> +# https://bo.io.gov.mo/bo/i/2024/16/despce.asp#64
>  country MO: DFS-FCC
> -       (2402 - 2482 @ 40), (23)
> -       (5170 - 5250 @ 80), (23), AUTO-BW
> -       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
> -       (5490 - 5730 @ 160), (30), DFS
> -       (5735 - 5835 @ 80), (30)
> +       (2400 - 2483.5 @ 40), (200 mW)
> +       (5150 - 5250 @ 80), (200 mW), AUTO-BW
> +       (5250 - 5350 @ 80), (200 mW), DFS, AUTO-BW
> +       (5470 - 5730 @ 160), (1000 mW), DFS
> +       (5725 - 5850 @ 80), (1000 mW)
> +       (5925 - 6425 @ 320), (250mW), NO-OUTDOOR
>
>  country MP: DFS-FCC
>         (2402 - 2472 @ 40), (30)
> --
> 2.25.1
>


From wens at kernel.org  Mon Jul  1 02:18:28 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Mon, 01 Jul 2024 17:18:28 +0800
Subject: (subset) [PATCH v2 1/4] wireless-regdb: Update regulatory info
 for Liechtenstein (LI) on 6GHz
In-Reply-To: <20240624025623.6021-1-pkshih@realtek.com>
References: <20240624025623.6021-1-pkshih@realtek.com>
Message-ID: <171982550898.1221830.493885225232689365.b4-ty@kernel.org>

On Mon, 24 Jun 2024 10:56:20 +0800, Ping-Ke Shih wrote:
> CEPT ECC/DEC/(20)01 of 20 November 2020 on the harmonised use of the
> frequency band 5945-6425 MHz for Wireless Access Systems including Radio
> Local Area Networks (WAS/RLAN), which [1] defines
> 
>  - LOW POWER INDOOR (LPI) DEVICES
>    * Restricted to indoor use only
>    * Maximum mean e.i.r.p. 23 dBm
>    * Maximum mean e.i.r.p. density 10 dBm/MHz
> 
> [...]

Applied to master in wens/wireless-regdb.git, thanks!

[1/4] wireless-regdb: Update regulatory info for Liechtenstein (LI) on 6GHz
      https://git.kernel.org/wens/wireless-regdb/c/f8ef7da3d44c

Best regards,
-- 
Chen-Yu Tsai <wens at kernel.org>



From wens at kernel.org  Mon Jul  1 02:26:22 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Mon, 1 Jul 2024 17:26:22 +0800
Subject: [PATCH] wireless-regdb: update regulatory rules for India (IN)
In-Reply-To: <d448ca6a-106a-478f-ad80-5c8730765ca0@nbd.name>
References: <20230416013031.158433-1-sforshee@kernel.org> <d448ca6a-106a-478f-ad80-5c8730765ca0@nbd.name>
Message-ID: <CAGb2v64ArWLugdvZfGxSGA3eqxcozMo1Xov77_93=A=FwtijNw@mail.gmail.com>

On Sat, Jun 22, 2024 at 1:54?AM Felix Fietkau <nbd at nbd.name> wrote:
>
> On 16.04.23 03:30, Seth Forshee wrote:
> > Increase the max EIRP for 2.4 GHz to 30 dBm, and add DFS for 5250-5350
> > MHz and 5470-5725 MHz.
> >
> > Source:
> > https://dot.gov.in/spectrummanagement/delicensing-24-24835-ghz-band-gsr-45-e-5150-5350-ghz-gsr-46-e-and-5725-5875-ghz
> > https://dot.gov.in/spectrummanagement/license-exemption-5-ghz-gsr-1048e-dated-22102018
> >
> > Signed-off-by: Seth Forshee <sforshee at kernel.org>
> > ---
> >   db.txt | 9 ++++++---
> >   1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/db.txt b/db.txt
> > index 915a3b94d418..2a7779510cc5 100644
> > --- a/db.txt
> > +++ b/db.txt
> > @@ -850,11 +850,14 @@ country IL: DFS-ETSI
> >       # Table B List of conditions, row 68, wireless device using 802.11a/n/ac protocol
> >       (5725 - 5875 @ 80), (200 mW), AUTO-BW
> >
> > +# Source:
> > +# https://dot.gov.in/spectrummanagement/delicensing-24-24835-ghz-band-gsr-45-e-5150-5350-ghz-gsr-46-e-and-5725-5875-ghz
> > +# https://dot.gov.in/spectrummanagement/license-exemption-5-ghz-gsr-1048e-dated-22102018
> >   country IN:
> > -     (2402 - 2482 @ 40), (20)
> > +     (2402 - 2482 @ 40), (30)
> >       (5150 - 5250 @ 80), (30)
> > -     (5250 - 5350 @ 80), (24)
> > -     (5470 - 5725 @ 160), (24)
> > +     (5250 - 5350 @ 80), (24), DFS
> > +     (5470 - 5725 @ 160), (24), DFS
>
> What about the DFS region? The DFS channels won't work without it.

The given references do not specify which region to follow. So unless someone
provides more information, there is nothing we can do.

ChenYu


From pkshih at gmail.com  Mon Jul  1 23:50:58 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Tue,  2 Jul 2024 14:50:58 +0800
Subject: [PATCH v3 1/3] wireless-regdb: Update regulatory info for Jordan (JO) for 2022
Message-ID: <20240702065100.13644-1-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

The Hashemite Kingdom of Jordan, Telecommunications Regulatory Authority
issued pursuant to the provisions of Articles (12A) and (22) of the
Telecommunications Law No. 31 of 1995, as amended. [1]

The effective radiated power (EIRP) of devices used in local radio computer
networks must not exceed the following values:

 - 2400-2483.5 MHz: 100 milliwatts (20 dBm)
 - 5150-5350 MHz: 200 milliwatts (23 dBm), (ETSI: 5250-5350 DFS)
 - 5470-5725 MHz: 1 watt (30 dBm), (ETSI: 27 dBm, indoor only, DFS)
 - 5725-5875 MHz: 200 mW (23 dBm), (ETSI: indoor only)
 - 5925-6425 MHz:
   * 25 milliwatts (14 dBm) (for outdoor and portable devices)
   * 200 milliwatts (23 dBm) (for devices operated indoors only)
 - 57-71 GHz: 10 W (40 dBm)

Follow ETSI EN 301 893 [2], which specifies reduced power limit of
20 and 27 dBm for the range 5150-5350 and 5470-5725 respectively for
devices that don't implement TPC; and classifies the 5470 - 5725 MHz and
5725 - 5875 MHz ranges as indoor use only; and DFS is required for bands
5250 - 5350 Mhz and 5470 - 5725 Mhz. (Add these rules followed rules of
[1] with "ETSI:" annotation)

[1] https://trc.gov.jo/EchoBusV3.0/SystemAssets/PDF/RSMD/cb9f9a83-43a6-4e66-8432-6e02ecaf465b_RLAN%20Arabic%20%20Final%20-%20clean%20with%2057-71%20GHz.pdf
[2] https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
v3:
  - DFS-ETSI
  - split frequency 5250 - 5350 as an individual range for DFS
v2:
  - Follow ETSI EN 301 893
  - add 57-71 GHz
---
 db.txt | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/db.txt b/db.txt
index 61c46186919e..4d2ebe46172d 100644
--- a/db.txt
+++ b/db.txt
@@ -957,10 +957,17 @@ country JM: DFS-FCC
 	(5490 - 5730 @ 160), (24), DFS
 	(5735 - 5835 @ 80), (30)
 
-country JO: DFS-JP
-	(2402 - 2482 @ 40), (20)
-	(5170 - 5250 @ 80), (23)
-	(5735 - 5835 @ 80), (23)
+# Source:
+# https://trc.gov.jo/EchoBusV3.0/SystemAssets/PDF/RSMD/cb9f9a83-43a6-4e66-8432-6e02ecaf465b_RLAN%20Arabic%20%20Final%20-%20clean%20with%2057-71%20GHz.pdf
+# ETSI EN 301 893: https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
+country JO: DFS-ETSI
+	(2400 - 2483.5 @ 40), (20)
+	(5150 - 5250 @ 80), (23), AUTO-BW
+	(5250 - 5350 @ 80), (23), DFS, AUTO-BW
+	(5470 - 5725 @ 80), (27), DFS, NO-OUTDOOR
+	(5725 - 5875 @ 80), (23), NO-OUTDOOR
+	(5925 - 6425 @ 320), (23), NO-OUTDOOR
+	(57000 - 71000 @ 2160), (40)
 
 # Source:
 # https://www.soumu.go.jp/main_content/000635492.pdf
-- 
2.25.1



From pkshih at gmail.com  Mon Jul  1 23:50:59 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Tue,  2 Jul 2024 14:50:59 +0800
Subject: [PATCH v3 2/3] wireless-regdb: Update regulatory info for Kenya (KE) for 2022
In-Reply-To: <20240702065100.13644-1-pkshih@gmail.com>
References: <20240702065100.13644-1-pkshih@gmail.com>
Message-ID: <20240702065100.13644-2-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

Communications of Authority of Kenya issued GUIDELINES ON THE USE OF
RADIOFREQUENCY SPECTRUM BY SHORT RANGE DEVICES on JUNE 2022 [1].
The section 5.8. covers frequency bands and technical parameters for
non-specific short range applications and wireless access systems.

 - 2400-2483.5 MHz: 2W e.i.r.p.
 - 5150-5350 MHz: 200mW; max e.i.r.p. density of 10mW/MHz
                  (ETSI [2]: 200mW (23dBm) -6 dBm to be 17 dBm;
                             5250-5350 DFS)
 - 5470-5725 MHz: 250mW; Max mean e.i.r.p. of 1W &
		  Max mean e.i.r.p. density of 50mW /MHz
                  (ETSI [2]: 1W (30dBm) -6 dBm to be 24 dBm)
 - 5725-5875 MHz: Mean e.i.r.p. spectral density of 23 dBm/MHz
                  Mean e.i.r.p. of 2W in any 10 MHz band
                  (ETSI [2]: 4W (36dBm) -6 dBm to be 30 dBm with TPC)
                  (ETSI [3]: The FWA device shall have the capability to
                   reduce the operating mean EIRP level to a level not
                   exceeding 24 dBm for ChS = 20 MHz and 21 dBm for
                   ChS = 10 MHz. 24 dBm is adopted)
 - 5925-6425 MHz:
   * LPI: 23 dBm (200 mW)
	  Mean e.i.r.p. density for in-band emissions 10 dBm/MHz
	  Indoor only
   * VLP: 14 dBm (25 mW)
	  Mean e.i.r.p. density for in-band emissions 1 dBm/MHz
	  Indoor and outdoor use

Reference ETSI EN 301 893 [2], for the 5 GHz and 5.8 GHz ranges, TPC is
required, being able to reduce TX power by up to 6 dB. ETSI EN 302 502 [3]
for TPC of 5.8 GHz. (Add this rule followed by [1] with annotation "ETSI:")

[1] https://www.ca.go.ke/sites/default/files/2023-06/Guidelines-on-the-Use-of-Radiofrequency-Spectrum-by-Short-Range-Devices-2022.pdf
[2] https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
[3] https://www.etsi.org/deliver/etsi_en/302500_302599/302502/02.01.01_60/en_302502v020101p.pdf

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
v3:
  - DFS-ETSI
  - split frequency 5250 - 5350 as an individual range for DFS
  - correct 5470 - 5725 to 24 dBm by e.i.r.p values.
  - correct 5725 - 5875 to 24 dBm by mean e.i.r.p. and ETSI EN 302 502, and
    more documentation.
v2:
  - align freq range of reference
  - use power unit as reference
  - -6dBm for 5 GHz and 5.8 GHz ranges
---
 db.txt | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/db.txt b/db.txt
index 4d2ebe46172d..c046e0269e67 100644
--- a/db.txt
+++ b/db.txt
@@ -985,11 +985,17 @@ country JP: DFS-JP
 	# ref: http://www.arib.or.jp/english/html/overview/doc/1-STD-T74v1_1.pdf
 	(57000 - 66000 @ 2160), (10 mW)
 
-country KE: DFS-JP
-	(2402 - 2482 @ 40), (20)
-	(5170 - 5250 @ 80), (23)
-	(5490 - 5570 @ 80), (30), DFS
-	(5735 - 5775 @ 40), (23)
+# Source:
+# https://www.ca.go.ke/sites/default/files/2023-06/Guidelines-on-the-Use-of-Radiofrequency-Spectrum-by-Short-Range-Devices-2022.pdf
+# ETSI EN 301 893: https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
+# ETSI EN 302 502: https://www.etsi.org/deliver/etsi_en/302500_302599/302502/02.01.01_60/en_302502v020101p.pdf
+country KE: DFS-ETSI
+	(2400 - 2483.5 @ 40), (2000 mW)
+	(5150 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5350 @ 80), (17), DFS, AUTO-BW
+	(5470 - 5725 @ 80), (24), DFS
+	(5725 - 5875 @ 40), (24), DFS
+	(5925 - 6425 @ 320), (23), NO-OUTDOOR
 
 country KH: DFS-ETSI
 	(2402 - 2482 @ 40), (20)
-- 
2.25.1



From pkshih at gmail.com  Mon Jul  1 23:51:00 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Tue,  2 Jul 2024 14:51:00 +0800
Subject: [PATCH v3 3/3] wireless-regdb: Update regulatory info for Macao (MO) for 2024
In-Reply-To: <20240702065100.13644-1-pkshih@gmail.com>
References: <20240702065100.13644-1-pkshih@gmail.com>
Message-ID: <20240702065100.13644-3-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

MACAU SPECIAL ADMINISTRATIVE REGION OFFICE OF THE CHIEF EXECUTIVE released
Order from the Chief Executive No. 64/2024, which wireless data
communications equipment defined as

 - 2400-2483.5 MHz 200mW
 - 5150-5350 MHz   200mW
 - 5470-5725 MHz   1W
 - 5725-5850 MHz   1W
 - 5925-6425 MHz   250 mW (for indoor use)
                   25 mW (for use in outdoor spaces)
 - 57-66 GHz       10 W

[1] https://bo.io.gov.mo/bo/i/2024/16/despce.asp#64

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
v3:
  - add 57-66 GHz
v2:
  - 5470-5725MHz to 5470-5730MHz to have 160Mhz bandwidth
  - keep DFS flag for original ranges since it defined DFS-FCC
---
 db.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/db.txt b/db.txt
index c046e0269e67..d7592c299c62 100644
--- a/db.txt
+++ b/db.txt
@@ -1259,12 +1259,16 @@ country MN: DFS-FCC
 	(5735 - 5835 @ 80), (30)
 	(5925 - 6425 @ 320), (100mW)
 
+# Source:
+# https://bo.io.gov.mo/bo/i/2024/16/despce.asp#64
 country MO: DFS-FCC
-	(2402 - 2482 @ 40), (23)
-	(5170 - 5250 @ 80), (23), AUTO-BW
-	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
-	(5490 - 5730 @ 160), (30), DFS
-	(5735 - 5835 @ 80), (30)
+	(2400 - 2483.5 @ 40), (200 mW)
+	(5150 - 5250 @ 80), (200 mW), AUTO-BW
+	(5250 - 5350 @ 80), (200 mW), DFS, AUTO-BW
+	(5470 - 5730 @ 160), (1000 mW), DFS
+	(5725 - 5850 @ 80), (1000 mW)
+	(5925 - 6425 @ 320), (250 mW), NO-OUTDOOR
+	(57000 - 66000 @ 2160), (10000 mW)
 
 country MP: DFS-FCC
 	(2402 - 2472 @ 40), (30)
-- 
2.25.1



From wens at kernel.org  Thu Jul  4 00:26:17 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Thu, 04 Jul 2024 15:26:17 +0800
Subject: [PATCH v3 1/3] wireless-regdb: Update regulatory info for
 Jordan (JO) for 2022
In-Reply-To: <20240702065100.13644-1-pkshih@gmail.com>
References: <20240702065100.13644-1-pkshih@gmail.com>
Message-ID: <172007797741.1245979.14807997228875413304.b4-ty@kernel.org>

On Tue, 02 Jul 2024 14:50:58 +0800, Ping-Ke Shih wrote:
> The Hashemite Kingdom of Jordan, Telecommunications Regulatory Authority
> issued pursuant to the provisions of Articles (12A) and (22) of the
> Telecommunications Law No. 31 of 1995, as amended. [1]
> 
> The effective radiated power (EIRP) of devices used in local radio computer
> networks must not exceed the following values:
> 
> [...]

Applied to master in wens/wireless-regdb.git, thanks!

[1/3] wireless-regdb: Update regulatory info for Jordan (JO) for 2022
      https://git.kernel.org/wens/wireless-regdb/c/a9ecabe9844b
[2/3] wireless-regdb: Update regulatory info for Kenya (KE) for 2022
      https://git.kernel.org/wens/wireless-regdb/c/5a9fdad41aeb
[3/3] wireless-regdb: Update regulatory info for Macao (MO) for 2024
      https://git.kernel.org/wens/wireless-regdb/c/19326c3fffab

Best regards,
-- 
Chen-Yu Tsai <wens at kernel.org>



From wens at kernel.org  Thu Jul  4 00:40:56 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Thu, 4 Jul 2024 15:40:56 +0800
Subject: [ANN] wireless-regdb: master-2024-07-04
Message-ID: <ZoZSCJeyLpAJhtVU@wens.tw>

A new release of wireless-regdb (master-2024-07-04) is available at:

https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2024.07.04.tar.xz

The short log of changes since the master-2024-05-08 release is below.

--

Chen-Yu Tsai (1):
      wireless-regdb: update regulatory database based on preceding changes

Ping-Ke Shih (19):
      wireless-regdb: Update regulatory rules for Mongolia (MN) on 6GHz
      wireless-regdb: Update regulatory rules for Saudi Arabia (SA) on 6GHz
      wireless-regdb: Update regulatory rules for South Africa (ZA) on 6GHz
      wireless-regdb: Update regulatory info for Thailand (TH) on 6GHz
      wireless-regdb: Update regulatory info for Malaysia (MY) for 2022
      wireless-regdb: Update regulatory info for Morocco (MA) on 6GHz
      wireless-regdb: Update regulatory info for Chile (CL) on 6GHz
      wireless-regdb: Update regulatory info for Mexico (MX) on 6GHz
      wireless-regdb: Update regulatory info for Iceland (IS) on 6GHz
      wireless-regdb: Update regulatory info for Mauritius(MU) on 6GHz
      wireless-regdb: Update regulatory info for Argentina (AR) on 6GHz
      wireless-regdb: Update regulatory info for United Arab Emirates (AE) on 6GHz
      wireless-regdb: Update regulatory info for Colombia (CO) on 6GHz
      wireless-regdb: Update regulatory info for Costa Rica (CR) for 2021
      wireless-regdb: Update regulatory info for Dominican Republic (DO) on 6GHz
      wireless-regdb: Update regulatory info for Liechtenstein (LI) on 6GHz
      wireless-regdb: Update regulatory info for Jordan (JO) for 2022
      wireless-regdb: Update regulatory info for Kenya (KE) for 2022
      wireless-regdb: Update regulatory info for Macao (MO) for 2024

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/wireless-regdb/attachments/20240704/c08eb1d0/attachment.sig>

From pkshih at gmail.com  Thu Jul  4 23:06:09 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri,  5 Jul 2024 14:06:09 +0800
Subject: [PATCH 1/5] wireless-regdb: Update regulatory info for New Zealand (NZ) for 2022
Message-ID: <20240705060613.28909-1-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

Radiocommunications Regulations (General User Radio Licence for Short Range
Devices) Notice 2022 listed spectrum:

2400.0000 - 2483.5000
  * e.i.r.p. 0 dBW (1 W)

5150.0000 - 5350.0000
 * the maximum power is 0 dBW (1 W) e.i.r.p. and
   the maximum permitted power spectral density is -13 dBW/MHz
   (17 dBm/Hz, 50 mW/MHz) e.i.r.p.
 * 5250 - 5350 MHz, If Transmitter Power Control is not used, then the
   maximum power (e.i.r.p.) value shall be reduced by 3 dB.

5470.0000 - 5725.0000
 * 5470 - 5725 MHz, transmitter peak power must not exceed -6 dBW (250 mW)
   If Transmitter Power Control is not used, then the maximum power
   (e.i.r.p.) value must be reduced by 3 dB.

5725.0000 - 5850.0000
 * 5725 - 5850 MHz, the transmitter peak power must not exceed 0 dBW (1 W)
   and the power spectral density must not exceed 17 dBm/MHz.

5925.0000 - 6425.0000
 * the maximum power is -6 dBW (24 dBm, 250 mW ) e.i.r.p. and
   the maximum permitted power spectral density is -19 dBW/MHz
   (11 dBm/MHz, 12.6 mW/MHz) e.i.r.p. for low power devices.
   Only be used indoors.
 * the maximum power is -16 dBW (14 dBm, 25 mW ) e.i.r.p. and
   the maximum permitted power spectral density is -29 dBW/MHz
   (1 dBm/MHz, 1.26 mW/MHz) e.i.r.p. for very low power devices.
   Very Low Power applications.

57000.0000 - 71000.0000
 * for devices transmitting at 10 dBW e.i.r.p or less,
   the power spectral density must not exceed -7 dBW/MHz e.i.r.p. and
   the maximum transmit power must not exceed -3 dBW at the antenna port
   or ports.
 * for devices transmitting greater than 10 dBW e.i.r.p., the power
   spectral density shall not exceed 8 dBW/MHz e.i.r.p and antennas with
   a gain greater than 30 dBi shall be used.

[1] https://gazette.govt.nz/notice/id/2022-go3100

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
 db.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/db.txt b/db.txt
index d7592c299c62..266ba2d48731 100644
--- a/db.txt
+++ b/db.txt
@@ -1416,12 +1416,16 @@ country NP: DFS-JP
 	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
 	(5735 - 5835 @ 80), (20)
 
+# Source:
+# https://gazette.govt.nz/notice/id/2022-go3100
 country NZ: DFS-ETSI
-	(2402 - 2482 @ 40), (30)
-	(5170 - 5250 @ 80), (17), AUTO-BW
-	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
-	(5490 - 5730 @ 160), (24), DFS
-	(5735 - 5835 @ 80), (30)
+	(2400 - 2483.5 @ 40), (30)
+	(5150 - 5250 @ 80), (30), AUTO-BW
+	(5250 - 5350 @ 80), (27), DFS, AUTO-BW
+	(5470 - 5730 @ 160), (21), DFS
+	(5725 - 5850 @ 80), (30)
+	(5925 - 6425 @ 320), (24), NO-OUTDOOR
+	(57000 - 71000 @ 2160), (40)
 
 country OM: DFS-ETSI
 	(2402 - 2482 @ 40), (20)
-- 
2.25.1



From pkshih at gmail.com  Thu Jul  4 23:06:10 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri,  5 Jul 2024 14:06:10 +0800
Subject: [PATCH 2/5] wireless-regdb: Update regulatory info for Peru (PE) on 6GHz
In-Reply-To: <20240705060613.28909-1-pkshih@gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com>
Message-ID: <20240705060613.28909-2-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

Ministerial Resolution -2021-MTC/01 decided

For the band 5925-7125 MHz, low power indoor case of use.
 - access point
   maximum EIRP: 30 dBm
   Limited power spectral density: 5 dBm / MHz
 - user devices
   maximum EIRP: 24 dBm
   Limited power spectral density: -1 dBm / MHz

[1] https://cdn.www.gob.pe/uploads/document/file/1861732/Resoluci%C3%B3n%20Ministerial%20nro%20373-2021-MTC/01.pdf

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
 db.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db.txt b/db.txt
index 266ba2d48731..2e862b322f13 100644
--- a/db.txt
+++ b/db.txt
@@ -1443,12 +1443,15 @@ country PA: DFS-FCC
 	(5725 - 5850 @ 80), (36)
 	(57000 - 64000 @ 2160), (43)
 
+# Source:
+# https://cdn.www.gob.pe/uploads/document/file/1861732/Resoluci%C3%B3n%20Ministerial%20nro%20373-2021-MTC/01.pdf
 country PE: DFS-FCC
 	(2402 - 2482 @ 40), (20)
 	(5170 - 5250 @ 80), (17), AUTO-BW
 	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
 	(5490 - 5730 @ 160), (24), DFS
 	(5735 - 5835 @ 80), (30)
+	(5925 - 7125 @ 320), (12), NO-OUTDOOR
 
 country PF: DFS-ETSI
 	(2402 - 2482 @ 40), (20)
-- 
2.25.1



From pkshih at gmail.com  Thu Jul  4 23:06:11 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri,  5 Jul 2024 14:06:11 +0800
Subject: [PATCH 3/5] wireless-regdb: Update regulatory info for Qatar (QA) on 6GHz
In-Reply-To: <20240705060613.28909-1-pkshih@gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com>
Message-ID: <20240705060613.28909-3-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

Communications Regulatory Authority, State of Qatar, released
Class License for the use of RLAN devices over 5925-6425 MHz Band on
26 April 2022 [2] via page [1].

Technical Requirements for the use of RLAN Devices over 5925-6425MHz
 - Low Power
   * e.i.r.p 23 dBm
   * Indoor Use only
 - Very Low Power
   * e.i.r.p 14 dBm
   * Indoor and Outdoor Use

[1] https://www.cra.gov.qa/en/document/class-license-for-the-use-of-rlan-devices-over-5925-6425-mhz-band
[2] https://www.cra.gov.qa/-/media/System/D/2/5/8/D258CF18B83A5613B0D590193CB799CB/Class-License-WIFI-6E-Final-English-032022--V3.ashx

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
 db.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db.txt b/db.txt
index 2e862b322f13..d6b14c055afb 100644
--- a/db.txt
+++ b/db.txt
@@ -1559,12 +1559,15 @@ country PY: DFS-FCC
 	(5490 - 5730 @ 160), (24), DFS
 	(5735 - 5835 @ 80), (30)
 
+# Source:
+# https://www.cra.gov.qa/-/media/System/D/2/5/8/D258CF18B83A5613B0D590193CB799CB/Class-License-WIFI-6E-Final-English-032022--V3.ashx
 country QA: DFS-ETSI
 	(2400 - 2483.5 @ 40), (100 mW), NO-OUTDOOR
 	(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
 	(5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS, AUTO-BW
 	(5470 - 5725 @ 160), (100 mW), NO-OUTDOOR, DFS
 	(5725 - 5875 @ 80), (100 mW), NO-OUTDOOR, DFS
+	(5925 - 6425 @ 320), (23), NO-OUTDOOR
 	(57000 - 66000 @ 2160), (40), NO-OUTDOOR
 
 country RE: DFS-ETSI
-- 
2.25.1



From pkshih at gmail.com  Thu Jul  4 23:06:12 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri,  5 Jul 2024 14:06:12 +0800
Subject: [PATCH 4/5] wireless-regdb: Update regulatory info for El Salvador (SV) on 6GHz
In-Reply-To: <20240705060613.28909-1-pkshih@gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com>
Message-ID: <20240705060613.28909-4-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

The General Superintendency of Electricity and Telecommunications Makes
Knowledge to the General issued resolution No. T-0408-2023.

Free use within the entire band for WLAN (WiFi) application, from
5925 MHz to 7125 MHz, must have following technical and operation
conditions:
 - access point
   * P.I.R.E 30 dBm
   * spectral density of P.I.R.E. 5 dBm/Mhz
 - client
   * P.I.R.E 24 dBm
   * spectral density of P.I.R.E. -1 dBm/Mhz
 - Indoor use only permitted

[1] https://www.siget.gob.sv/actualizacion-de-cuadro-nacional-de-atribucion-de-frecuencias-t-0408-2023/

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
 db.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db.txt b/db.txt
index d6b14c055afb..2a4f1ed524c1 100644
--- a/db.txt
+++ b/db.txt
@@ -1736,11 +1736,14 @@ country SR: DFS-ETSI
 	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
 	(5490 - 5710 @ 160), (27), DFS
 
+# Source:
+# https://www.siget.gob.sv/actualizacion-de-cuadro-nacional-de-atribucion-de-frecuencias-t-0408-2023/
 country SV: DFS-FCC
 	(2402 - 2482 @ 40), (20)
 	(5170 - 5250 @ 20), (17)
 	(5250 - 5330 @ 20), (23), DFS
 	(5735 - 5835 @ 20), (30)
+	(5925 - 7125 @ 320), (12), NO-OUTDOOR
 
 country SY:
 	(2402 - 2482 @ 40), (20)
-- 
2.25.1



From pkshih at gmail.com  Thu Jul  4 23:06:13 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri,  5 Jul 2024 14:06:13 +0800
Subject: [PATCH 5/5] wireless-regdb: Update regulatory info for Togo (TG) for 2022
In-Reply-To: <20240705060613.28909-1-pkshih@gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com>
Message-ID: <20240705060613.28909-5-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

Republic ToGolaise released Decision N 226/ARCEP/DG/22.

2400-2483.5 MHz
  - EIRP 100 mW and 10 mW/MHz density
5150-5350 MHz
  - EIRP 200 mW
  - If TPC is not used, must be reduced by 3 dB
5470-5850 MHz
  - EIRP 1W
  - If TPC is not used, must be reduced by 3 dB
5925-6425 MHz
  - LPI
    * EIRP 23 dBm (200 mW)
    * EIRP density 10 dBm/MHz
    * Use limited to indoor
  - VLP
    * EIRP 14 dBm (25 mW)
    * EIRP density -1 dBm/MHz
57-66 GHz
  - EIRP 40 dBm and 13 dBm/MHz density

[1] https://arcep.tg/wp-content/uploads/2022/12/Decision-226-22-Determinant-les-categories-et-conditions-techniques-dexploitation-des-appareils-de-faible-puissance-et-de-faible-portee.pdf

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
 db.txt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/db.txt b/db.txt
index 2a4f1ed524c1..6192dafe9715 100644
--- a/db.txt
+++ b/db.txt
@@ -1763,11 +1763,15 @@ country TD: DFS-ETSI
 	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
 	(5490 - 5710 @ 160), (27), DFS
 
+# Source:
+# https://arcep.tg/wp-content/uploads/2022/12/Decision-226-22-Determinant-les-categories-et-conditions-techniques-dexploitation-des-appareils-de-faible-puissance-et-de-faible-portee.pdf
 country TG: DFS-ETSI
-	(2402 - 2482 @ 40), (20)
-	(5170 - 5250 @ 40), (20)
-	(5250 - 5330 @ 40), (20), DFS
-	(5490 - 5710 @ 40), (27), DFS
+	(2400 - 2483.5 @ 40), (100 mW)
+	(5150 - 5250 @ 40), (200 mW)
+	(5250 - 5350 @ 40), (20), DFS
+	(5470 - 5850 @ 40), (27), DFS
+	(5925 - 6425 @ 320), (23), NO-OUTDOOR
+	(57000 - 66000 @2160), (40)
 
 # Source:
 # https://ratchakitcha.soc.go.th/documents/140D100S0000000004000.pdf
-- 
2.25.1



From pkshih at gmail.com  Wed Jul 17 20:17:18 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Thu, 18 Jul 2024 11:17:18 +0800
Subject: [PATCH] wireless-regdb: Add regulatory info for Namibia (NA) for 2023
Message-ID: <20240718031718.19403-1-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

COMMUNICATIONS REGULATORY AUTHORITY OF NAMIBIA released NOTICE IN TERMS OF
THE REGULATIONS REGARDING THE SUBMISSIONS OF INTERCONNECTION AGREEMENTS
AND TARIFFS on 3 April 2023 [1].

* 2400-2483.5 MHz
  100 mW e.i.r.p.

* 5150-5350 MHz
  200 mW mean e.i.r.p.
  Restricted to indoor use
  The maximum mean e.i.r.p. density shall be limited to 10 mW/MHz
  (ETSI [2]: 200mW (23dBm) -6 dBm to be 17 dBm; DFS 5250-5350)

* 5470-5725 MHz
  250 mW e.i.r.p.
  Indoor as well as outdoor use allowed.
  The maximum mean e.i.r.p. density shall be limited to 50 mW/MHz
  (ETSI [2]: 250mW (24dBm) -6 dBm to be 18 dBm; DFS)

* 5725-5 875 MHz
  PTP/PTMP: max mean e.i.r.p = 4 W
  Mesh/AP-MP: max mean e.i.r.p = 2 W
  (ETSI [3]: The FWA device shall have the capability to reduce the
   operating mean EIRP level to a level not exceeding 24 dBm for
   ChS = 20 MHz and 21 dBm for ChS = 10 MHz. 24 dBm is adopted)

* 5925-6425 MHz
  - 23 dBm (200mW) mean e.i.r.p
    Restricted to indoor use only.
    Mean e.i.r.p density for in-band emissions = 10 dBM/MHz
  - 14 dBm (25) e.i.r.p mW
    Very Low Power (VLP) indoor outdoor use.
    Maximum meand e.i.r.p. for inband emissions = 1 dBm/MHz

* 57-66 GHz
  40 dBm (10W) mean e.i.r.p
  23 dBm/MHz e.i.r.p. density
  Indoor use only

The EN 301 893 [2] specifies reduced power limit of 23 and 27 dBm for
5150-5350 MHz and 5470-5725 MHz respectively for devices that don't
implement TPC. Also reduced TPC requires being able to reduce TX power by
up to 6 dB. The DFS applicable frequency range are 5250-5350 MHz and
5470-5725 MHz.

[1] https://www.cran.na/yglilidy/2023/04/GG-8060-dated-3-April-2023.pdf
[2] EN 301 893 https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
[3] EN 302 502 https://www.etsi.org/deliver/etsi_en/302500_302599/302502/02.01.01_60/en_302502v020101p.pdf

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
 db.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/db.txt b/db.txt
index 6192dafe9715..2a50afb60c06 100644
--- a/db.txt
+++ b/db.txt
@@ -1355,6 +1355,17 @@ country MY: DFS-FCC
 	(5735 - 5835 @ 80), (1000 mW)
 	(5925 - 6425 @ 320), (200 mW), NO-OUTDOOR
 
+# Source:
+# https://www.cran.na/yglilidy/2023/04/GG-8060-dated-3-April-2023.pdf
+country NA: DFS-ETSI
+	(2400 - 2483.5 @ 40), (100 mW)
+	(5150 - 5250 @ 80), (17), AUTO-BW, NO-OUTDOOR
+	(5250 - 5350 @ 80), (17), DFS, AUTO-BW, NO-OUTDOOR
+	(5470 - 5725 @ 160), (18), DFS
+	(5725 - 5875 @ 80), (24)
+	(5925 - 6425 @ 320), (23), NO-OUTDOOR
+	(57000 - 66000 @ 2160), (40), NO-OUTDOOR
+
 country NG: DFS-ETSI
 	(2402 - 2482 @ 40), (20)
 	(5250 - 5330 @ 80), (30), DFS
-- 
2.25.1



From wens at kernel.org  Wed Jul 17 21:37:32 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Thu, 18 Jul 2024 12:37:32 +0800
Subject: [PATCH 1/5] wireless-regdb: Update regulatory info for New
 Zealand (NZ) for 2022
In-Reply-To: <20240705060613.28909-1-pkshih@gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com>
Message-ID: <CAGb2v67hWYHebORsjHuOw2mA+mwpmoCUF4vhAHE7Xt81VvZrtQ@mail.gmail.com>

On Fri, Jul 5, 2024 at 2:06?PM Ping-Ke Shih <pkshih at gmail.com> wrote:
>
> From: Ping-Ke Shih <pkshih at realtek.com>
>
> Radiocommunications Regulations (General User Radio Licence for Short Range
> Devices) Notice 2022 listed spectrum:
>
> 2400.0000 - 2483.5000
>   * e.i.r.p. 0 dBW (1 W)

13. Transmitters using e.i.r.p. greater than 0 dBW (1 W) must employ
    frequency hopping or digital modulation techniques.

AFAIK WiFi uses digital modulation techniques. So this could be
raised up to 6 dBW?

> 5150.0000 - 5350.0000
>  * the maximum power is 0 dBW (1 W) e.i.r.p. and
>    the maximum permitted power spectral density is -13 dBW/MHz
>    (17 dBm/Hz, 50 mW/MHz) e.i.r.p.
>  * 5250 - 5350 MHz, If Transmitter Power Control is not used, then the
>    maximum power (e.i.r.p.) value shall be reduced by 3 dB.
>
> 5470.0000 - 5725.0000
>  * 5470 - 5725 MHz, transmitter peak power must not exceed -6 dBW (250 mW)
>    If Transmitter Power Control is not used, then the maximum power
>    (e.i.r.p.) value must be reduced by 3 dB.

We use e.i.r.p. value in the database. The limit is 1W, then minus 3 dB
due to lack of TPC.

> 5725.0000 - 5850.0000
>  * 5725 - 5850 MHz, the transmitter peak power must not exceed 0 dBW (1 W)
>    and the power spectral density must not exceed 17 dBm/MHz.

13. Transmitters using e.i.r.p. greater than 0 dBW (1 W) must employ
    frequency hopping or digital modulation techniques.

AFAIK WiFi uses digital modulation techniques. So this could be
raised up to 6 dBW?


Thanks
ChenYu

> 5925.0000 - 6425.0000
>  * the maximum power is -6 dBW (24 dBm, 250 mW ) e.i.r.p. and
>    the maximum permitted power spectral density is -19 dBW/MHz
>    (11 dBm/MHz, 12.6 mW/MHz) e.i.r.p. for low power devices.
>    Only be used indoors.
>  * the maximum power is -16 dBW (14 dBm, 25 mW ) e.i.r.p. and
>    the maximum permitted power spectral density is -29 dBW/MHz
>    (1 dBm/MHz, 1.26 mW/MHz) e.i.r.p. for very low power devices.
>    Very Low Power applications.
>
> 57000.0000 - 71000.0000
>  * for devices transmitting at 10 dBW e.i.r.p or less,
>    the power spectral density must not exceed -7 dBW/MHz e.i.r.p. and
>    the maximum transmit power must not exceed -3 dBW at the antenna port
>    or ports.
>  * for devices transmitting greater than 10 dBW e.i.r.p., the power
>    spectral density shall not exceed 8 dBW/MHz e.i.r.p and antennas with
>    a gain greater than 30 dBi shall be used.
>
> [1] https://gazette.govt.nz/notice/id/2022-go3100
>
> Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
> ---
>  db.txt | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/db.txt b/db.txt
> index d7592c299c62..266ba2d48731 100644
> --- a/db.txt
> +++ b/db.txt
> @@ -1416,12 +1416,16 @@ country NP: DFS-JP
>         (5250 - 5330 @ 80), (20), DFS, AUTO-BW
>         (5735 - 5835 @ 80), (20)
>
> +# Source:
> +# https://gazette.govt.nz/notice/id/2022-go3100
>  country NZ: DFS-ETSI
> -       (2402 - 2482 @ 40), (30)
> -       (5170 - 5250 @ 80), (17), AUTO-BW
> -       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
> -       (5490 - 5730 @ 160), (24), DFS
> -       (5735 - 5835 @ 80), (30)
> +       (2400 - 2483.5 @ 40), (30)
> +       (5150 - 5250 @ 80), (30), AUTO-BW
> +       (5250 - 5350 @ 80), (27), DFS, AUTO-BW
> +       (5470 - 5730 @ 160), (21), DFS
> +       (5725 - 5850 @ 80), (30)
> +       (5925 - 6425 @ 320), (24), NO-OUTDOOR
> +       (57000 - 71000 @ 2160), (40)
>
>  country OM: DFS-ETSI
>         (2402 - 2482 @ 40), (20)
> --
> 2.25.1
>


From wens at kernel.org  Wed Jul 17 21:41:47 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Thu, 18 Jul 2024 12:41:47 +0800
Subject: [PATCH 2/5] wireless-regdb: Update regulatory info for Peru (PE)
 on 6GHz
In-Reply-To: <20240705060613.28909-2-pkshih@gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com> <20240705060613.28909-2-pkshih@gmail.com>
Message-ID: <CAGb2v67QC3_L740rctZeJTagF888_5jhQinPNVkfEy_pEgvKNg@mail.gmail.com>

On Fri, Jul 5, 2024 at 2:06?PM Ping-Ke Shih <pkshih at gmail.com> wrote:
>
> From: Ping-Ke Shih <pkshih at realtek.com>
>
> Ministerial Resolution -2021-MTC/01 decided
>
> For the band 5925-7125 MHz, low power indoor case of use.
>  - access point
>    maximum EIRP: 30 dBm
>    Limited power spectral density: 5 dBm / MHz
>  - user devices
>    maximum EIRP: 24 dBm
>    Limited power spectral density: -1 dBm / MHz

Please explicitly mention that the PSD limits the rule to 12 dBm.

Otherwise this looks good.

ChenYu

> [1] https://cdn.www.gob.pe/uploads/document/file/1861732/Resoluci%C3%B3n%20Ministerial%20nro%20373-2021-MTC/01.pdf
>
> Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
> ---
>  db.txt | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/db.txt b/db.txt
> index 266ba2d48731..2e862b322f13 100644
> --- a/db.txt
> +++ b/db.txt
> @@ -1443,12 +1443,15 @@ country PA: DFS-FCC
>         (5725 - 5850 @ 80), (36)
>         (57000 - 64000 @ 2160), (43)
>
> +# Source:
> +# https://cdn.www.gob.pe/uploads/document/file/1861732/Resoluci%C3%B3n%20Ministerial%20nro%20373-2021-MTC/01.pdf
>  country PE: DFS-FCC
>         (2402 - 2482 @ 40), (20)
>         (5170 - 5250 @ 80), (17), AUTO-BW
>         (5250 - 5330 @ 80), (24), DFS, AUTO-BW
>         (5490 - 5730 @ 160), (24), DFS
>         (5735 - 5835 @ 80), (30)
> +       (5925 - 7125 @ 320), (12), NO-OUTDOOR
>
>  country PF: DFS-ETSI
>         (2402 - 2482 @ 40), (20)
> --
> 2.25.1
>


From wens at kernel.org  Wed Jul 17 21:43:47 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Thu, 18 Jul 2024 12:43:47 +0800
Subject: [PATCH 4/5] wireless-regdb: Update regulatory info for El
 Salvador (SV) on 6GHz
In-Reply-To: <20240705060613.28909-4-pkshih@gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com> <20240705060613.28909-4-pkshih@gmail.com>
Message-ID: <CAGb2v66Xga1j_VELV1XXzOVxr_i6YdmFCSDRYmxOtq9rj3GfBQ@mail.gmail.com>

On Fri, Jul 5, 2024 at 2:06?PM Ping-Ke Shih <pkshih at gmail.com> wrote:
>
> From: Ping-Ke Shih <pkshih at realtek.com>
>
> The General Superintendency of Electricity and Telecommunications Makes
> Knowledge to the General issued resolution No. T-0408-2023.
>
> Free use within the entire band for WLAN (WiFi) application, from
> 5925 MHz to 7125 MHz, must have following technical and operation
> conditions:
>  - access point
>    * P.I.R.E 30 dBm
>    * spectral density of P.I.R.E. 5 dBm/Mhz
>  - client
>    * P.I.R.E 24 dBm
>    * spectral density of P.I.R.E. -1 dBm/Mhz
>  - Indoor use only permitted

Please explicitly mention that the PSD limits the rule to 12 dBm.

ChenYu

> [1] https://www.siget.gob.sv/actualizacion-de-cuadro-nacional-de-atribucion-de-frecuencias-t-0408-2023/
>
> Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
> ---
>  db.txt | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/db.txt b/db.txt
> index d6b14c055afb..2a4f1ed524c1 100644
> --- a/db.txt
> +++ b/db.txt
> @@ -1736,11 +1736,14 @@ country SR: DFS-ETSI
>         (5250 - 5330 @ 80), (20), DFS, AUTO-BW
>         (5490 - 5710 @ 160), (27), DFS
>
> +# Source:
> +# https://www.siget.gob.sv/actualizacion-de-cuadro-nacional-de-atribucion-de-frecuencias-t-0408-2023/
>  country SV: DFS-FCC
>         (2402 - 2482 @ 40), (20)
>         (5170 - 5250 @ 20), (17)
>         (5250 - 5330 @ 20), (23), DFS
>         (5735 - 5835 @ 20), (30)
> +       (5925 - 7125 @ 320), (12), NO-OUTDOOR
>
>  country SY:
>         (2402 - 2482 @ 40), (20)
> --
> 2.25.1
>


From wens at kernel.org  Wed Jul 17 22:02:21 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Thu, 18 Jul 2024 13:02:21 +0800
Subject: [PATCH 5/5] wireless-regdb: Update regulatory info for Togo (TG)
 for 2022
In-Reply-To: <20240705060613.28909-5-pkshih@gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com> <20240705060613.28909-5-pkshih@gmail.com>
Message-ID: <CAGb2v64mLd+jhwL2EXZ=zTJZ2VuMXTa==NvAqib=xQrNg-ufkQ@mail.gmail.com>

On Fri, Jul 5, 2024 at 2:06?PM Ping-Ke Shih <pkshih at gmail.com> wrote:
>
> From: Ping-Ke Shih <pkshih at realtek.com>
>
> Republic ToGolaise released Decision N 226/ARCEP/DG/22.
>
> 2400-2483.5 MHz
>   - EIRP 100 mW and 10 mW/MHz density
> 5150-5350 MHz
>   - EIRP 200 mW
>   - If TPC is not used, must be reduced by 3 dB
> 5470-5850 MHz
>   - EIRP 1W
>   - If TPC is not used, must be reduced by 3 dB
> 5925-6425 MHz
>   - LPI
>     * EIRP 23 dBm (200 mW)
>     * EIRP density 10 dBm/MHz

The document you linked to suggests it is actually -10 dBm/MHz,
which kind of makes it useless as the total e.i.r.p for a 20 MHz
channel would be 2 mW or 3 dBm...

And the PSD for LP being lower than VLP seems like an error.

>     * Use limited to indoor
>   - VLP
>     * EIRP 14 dBm (25 mW)
>     * EIRP density -1 dBm/MHz
> 57-66 GHz
>   - EIRP 40 dBm and 13 dBm/MHz density
>
> [1] https://arcep.tg/wp-content/uploads/2022/12/Decision-226-22-Determinant-les-categories-et-conditions-techniques-dexploitation-des-appareils-de-faible-puissance-et-de-faible-portee.pdf
>
> Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
> ---
>  db.txt | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/db.txt b/db.txt
> index 2a4f1ed524c1..6192dafe9715 100644
> --- a/db.txt
> +++ b/db.txt
> @@ -1763,11 +1763,15 @@ country TD: DFS-ETSI
>         (5250 - 5330 @ 80), (20), DFS, AUTO-BW
>         (5490 - 5710 @ 160), (27), DFS
>
> +# Source:
> +# https://arcep.tg/wp-content/uploads/2022/12/Decision-226-22-Determinant-les-categories-et-conditions-techniques-dexploitation-des-appareils-de-faible-puissance-et-de-faible-portee.pdf
>  country TG: DFS-ETSI
> -       (2402 - 2482 @ 40), (20)
> -       (5170 - 5250 @ 40), (20)
> -       (5250 - 5330 @ 40), (20), DFS
> -       (5490 - 5710 @ 40), (27), DFS
> +       (2400 - 2483.5 @ 40), (100 mW)
> +       (5150 - 5250 @ 40), (200 mW)
> +       (5250 - 5350 @ 40), (20), DFS

The regulation doesn't say this can be split. It's one rule for 5150 - 5350.

> +       (5470 - 5850 @ 40), (27), DFS

Why only 40 MHz channels?

> +       (5925 - 6425 @ 320), (23), NO-OUTDOOR
> +       (57000 - 66000 @2160), (40)

Regulation requires DFS on all bands.


ChenYu


>  # Source:
>  # https://ratchakitcha.soc.go.th/documents/140D100S0000000004000.pdf
> --
> 2.25.1
>


From wens at kernel.org  Wed Jul 17 22:04:07 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Thu, 18 Jul 2024 13:04:07 +0800
Subject: [PATCH 3/5] wireless-regdb: Update regulatory info for Qatar
 (QA) on 6GHz
In-Reply-To: <20240705060613.28909-3-pkshih@gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com>
 <20240705060613.28909-3-pkshih@gmail.com>
Message-ID: <172127904781.1446368.11576831399749742872.b4-ty@kernel.org>

On Fri, 05 Jul 2024 14:06:11 +0800, Ping-Ke Shih wrote:
> Communications Regulatory Authority, State of Qatar, released
> Class License for the use of RLAN devices over 5925-6425 MHz Band on
> 26 April 2022 [2] via page [1].
> 
> Technical Requirements for the use of RLAN Devices over 5925-6425MHz
>  - Low Power
>    * e.i.r.p 23 dBm
>    * Indoor Use only
>  - Very Low Power
>    * e.i.r.p 14 dBm
>    * Indoor and Outdoor Use
> 
> [...]

Applied to master in wens/wireless-regdb.git, thanks!

[3/5] wireless-regdb: Update regulatory info for Qatar (QA) on 6GHz
      https://git.kernel.org/wens/wireless-regdb/c/c7d1083bc5c1

Best regards,
-- 
Chen-Yu Tsai <wens at kernel.org>



From wens at kernel.org  Thu Jul 18 00:07:31 2024
From: wens at kernel.org (Chen-Yu Tsai)
Date: Thu, 18 Jul 2024 15:07:31 +0800
Subject: [PATCH] wireless-regdb: Add regulatory info for Namibia (NA) for 2023
In-Reply-To: <20240718031718.19403-1-pkshih@gmail.com>
References: <20240718031718.19403-1-pkshih@gmail.com>
Message-ID: <CAGb2v67CxDRfazXSHEpKDhAYULggf1Jqgd+Aj=JEJyGnZ1Ge=A@mail.gmail.com>

On Thu, Jul 18, 2024 at 11:17?AM Ping-Ke Shih <pkshih at gmail.com> wrote:
>
> From: Ping-Ke Shih <pkshih at realtek.com>
>
> COMMUNICATIONS REGULATORY AUTHORITY OF NAMIBIA released NOTICE IN TERMS OF
> THE REGULATIONS REGARDING THE SUBMISSIONS OF INTERCONNECTION AGREEMENTS
> AND TARIFFS on 3 April 2023 [1].
>
> * 2400-2483.5 MHz
>   100 mW e.i.r.p.
>
> * 5150-5350 MHz
>   200 mW mean e.i.r.p.
>   Restricted to indoor use
>   The maximum mean e.i.r.p. density shall be limited to 10 mW/MHz
>   (ETSI [2]: 200mW (23dBm) -6 dBm to be 17 dBm; DFS 5250-5350)

EN 301 893 says for devices without TPC, the limit is lowered 3 dBm only,
as you mentioned below.

I previously requested -6 dBm because that country's regulation said
that "TPC is required".

> * 5470-5725 MHz
>   250 mW e.i.r.p.
>   Indoor as well as outdoor use allowed.
>   The maximum mean e.i.r.p. density shall be limited to 50 mW/MHz
>   (ETSI [2]: 250mW (24dBm) -6 dBm to be 18 dBm; DFS)

Same here, without TPC the limit is lowered by 3 dBm.

>
> * 5725-5 875 MHz

          ^ drop the space

>   PTP/PTMP: max mean e.i.r.p = 4 W
>   Mesh/AP-MP: max mean e.i.r.p = 2 W
>   (ETSI [3]: The FWA device shall have the capability to reduce the
>    operating mean EIRP level to a level not exceeding 24 dBm for
>    ChS = 20 MHz and 21 dBm for ChS = 10 MHz. 24 dBm is adopted)

Per ETSI EN 302 502, this range requires DFS.

> * 5925-6425 MHz
>   - 23 dBm (200mW) mean e.i.r.p
>     Restricted to indoor use only.
>     Mean e.i.r.p density for in-band emissions = 10 dBM/MHz

         Should be dBm (I know it says dBM in the doc)  ^

>   - 14 dBm (25) e.i.r.p mW
>     Very Low Power (VLP) indoor outdoor use.
>     Maximum meand e.i.r.p. for inband emissions = 1 dBm/MHz

                  ^ extra d
>
> * 57-66 GHz
>   40 dBm (10W) mean e.i.r.p
>   23 dBm/MHz e.i.r.p. density
>   Indoor use only

The rest looks good.

ChenYu

> The EN 301 893 [2] specifies reduced power limit of 23 and 27 dBm for
> 5150-5350 MHz and 5470-5725 MHz respectively for devices that don't
> implement TPC. Also reduced TPC requires being able to reduce TX power by
> up to 6 dB. The DFS applicable frequency range are 5250-5350 MHz and
> 5470-5725 MHz.
>
> [1] https://www.cran.na/yglilidy/2023/04/GG-8060-dated-3-April-2023.pdf
> [2] EN 301 893 https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
> [3] EN 302 502 https://www.etsi.org/deliver/etsi_en/302500_302599/302502/02.01.01_60/en_302502v020101p.pdf
>
> Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
> ---
>  db.txt | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/db.txt b/db.txt
> index 6192dafe9715..2a50afb60c06 100644
> --- a/db.txt
> +++ b/db.txt
> @@ -1355,6 +1355,17 @@ country MY: DFS-FCC
>         (5735 - 5835 @ 80), (1000 mW)
>         (5925 - 6425 @ 320), (200 mW), NO-OUTDOOR
>
> +# Source:
> +# https://www.cran.na/yglilidy/2023/04/GG-8060-dated-3-April-2023.pdf
> +country NA: DFS-ETSI
> +       (2400 - 2483.5 @ 40), (100 mW)
> +       (5150 - 5250 @ 80), (17), AUTO-BW, NO-OUTDOOR
> +       (5250 - 5350 @ 80), (17), DFS, AUTO-BW, NO-OUTDOOR
> +       (5470 - 5725 @ 160), (18), DFS
> +       (5725 - 5875 @ 80), (24)
> +       (5925 - 6425 @ 320), (23), NO-OUTDOOR
> +       (57000 - 66000 @ 2160), (40), NO-OUTDOOR
> +
>  country NG: DFS-ETSI
>         (2402 - 2482 @ 40), (20)
>         (5250 - 5330 @ 80), (30), DFS
> --
> 2.25.1
>


From pkshih at gmail.com  Thu Jul 18 20:07:12 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri, 19 Jul 2024 11:07:12 +0800
Subject: [PATCH 5/5] wireless-regdb: Update regulatory info for Togo (TG)
 for 2022
In-Reply-To: <CAGb2v64mLd+jhwL2EXZ=zTJZ2VuMXTa==NvAqib=xQrNg-ufkQ@mail.gmail.com>
References: <20240705060613.28909-1-pkshih@gmail.com> <20240705060613.28909-5-pkshih@gmail.com>
 <CAGb2v64mLd+jhwL2EXZ=zTJZ2VuMXTa==NvAqib=xQrNg-ufkQ@mail.gmail.com>
Message-ID: <CAHrRpunYADgM3NcrSC38GPzqGwUBePA84zLMM5u91kz81ZsU5w@mail.gmail.com>

Chen-Yu Tsai <wens at kernel.org> wrote:
>
> On Fri, Jul 5, 2024 at 2:06?PM Ping-Ke Shih <pkshih at gmail.com> wrote:
> >
> > 5925-6425 MHz
> >   - LPI
> >     * EIRP 23 dBm (200 mW)
> >     * EIRP density 10 dBm/MHz
>
> The document you linked to suggests it is actually -10 dBm/MHz,
> which kind of makes it useless as the total e.i.r.p for a 20 MHz
> channel would be 2 mW or 3 dBm...
>
> And the PSD for LP being lower than VLP seems like an error.

Since it looks like an error, I keep the power limit as I made, but
add some description by v2.

Thanks for the review.
Ping-Ke


From pkshih at gmail.com  Thu Jul 18 20:23:22 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri, 19 Jul 2024 11:23:22 +0800
Subject: [PATCH v2 1/5] wireless-regdb: Update regulatory info for New Zealand (NZ) for 2022
Message-ID: <20240719032326.7353-1-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

Radiocommunications Regulations (General User Radio Licence for Short Range
Devices) Notice 2022 listed spectrum:

2400.0000 - 2483.5000
  * e.i.r.p. 6 dBW (36 dBm)

5150.0000 - 5350.0000
 * the maximum power is 0 dBW (1 W) e.i.r.p. and
   the maximum permitted power spectral density is -13 dBW/MHz
   (17 dBm/Hz, 50 mW/MHz) e.i.r.p.
 * 5250 - 5350 MHz, If Transmitter Power Control is not used, then the
   maximum power (e.i.r.p.) value shall be reduced by 3 dB.

5470.0000 - 5725.0000
 * 5470 - 5725 MHz, The maximum power is 0 dBW (1 W) e.i.r.p. and the
   maximum permitted power spectral density is -13 dBW/MHz (50 mW/MHz)
   e.i.r.p. If Transmitter Power Control is not used, then the maximum
   power (e.i.r.p.) value must be reduced by 3 dB.
 * Then 27 dBm is adopted (0 dBW - minus 3 dB due to lack of TPC)

5725.0000 - 5875.0000
 * e.i.r.p. 6 dBW (36 dBm)

5925.0000 - 6425.0000
 * the maximum power is -6 dBW (24 dBm, 250 mW ) e.i.r.p. and
   the maximum permitted power spectral density is -19 dBW/MHz
   (11 dBm/MHz, 12.6 mW/MHz) e.i.r.p. for low power devices.
   Only be used indoors.
 * the maximum power is -16 dBW (14 dBm, 25 mW ) e.i.r.p. and
   the maximum permitted power spectral density is -29 dBW/MHz
   (1 dBm/MHz, 1.26 mW/MHz) e.i.r.p. for very low power devices.
   Very Low Power applications.

57000.0000 - 71000.0000
 * for devices transmitting at 10 dBW e.i.r.p or less,
   the power spectral density must not exceed -7 dBW/MHz e.i.r.p. and
   the maximum transmit power must not exceed -3 dBW at the antenna port
   or ports.
 * for devices transmitting greater than 10 dBW e.i.r.p., the power
   spectral density shall not exceed 8 dBW/MHz e.i.r.p and antennas with
   a gain greater than 30 dBi shall be used.

[1] https://gazette.govt.nz/notice/id/2022-go3100

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
v2:
  - correct 2400 - 2483.5 to 6dBW
  - correct 5470 - 5730 to 27dBm
  - correct 5725 - 5875 to 6dBW
---
 db.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/db.txt b/db.txt
index 7a1221f1699d..5cada55b51eb 100644
--- a/db.txt
+++ b/db.txt
@@ -1416,12 +1416,16 @@ country NP: DFS-JP
 	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
 	(5735 - 5835 @ 80), (20)
 
+# Source:
+# https://gazette.govt.nz/notice/id/2022-go3100
 country NZ: DFS-ETSI
-	(2402 - 2482 @ 40), (30)
-	(5170 - 5250 @ 80), (17), AUTO-BW
-	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
-	(5490 - 5730 @ 160), (24), DFS
-	(5735 - 5835 @ 80), (30)
+	(2400 - 2483.5 @ 40), (36)
+	(5150 - 5250 @ 80), (30), AUTO-BW
+	(5250 - 5350 @ 80), (27), DFS, AUTO-BW
+	(5470 - 5730 @ 160), (27), DFS
+	(5725 - 5875 @ 80), (36)
+	(5925 - 6425 @ 320), (24), NO-OUTDOOR
+	(57000 - 71000 @ 2160), (40)
 
 country OM: DFS-ETSI
 	(2402 - 2482 @ 40), (20)
-- 
2.25.1



From pkshih at gmail.com  Thu Jul 18 20:23:23 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri, 19 Jul 2024 11:23:23 +0800
Subject: [PATCH v2 2/5] wireless-regdb: Update regulatory info for Peru (PE) on 6GHz
In-Reply-To: <20240719032326.7353-1-pkshih@gmail.com>
References: <20240719032326.7353-1-pkshih@gmail.com>
Message-ID: <20240719032326.7353-2-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

Ministerial Resolution -2021-MTC/01 decided

For the band 5925-7125 MHz, low power indoor case of use.
 - access point
   maximum EIRP: 30 dBm
   Limited power spectral density: 5 dBm / MHz
 - user devices
   maximum EIRP: 24 dBm
   Limited power spectral density: -1 dBm / MHz

With minimum bandwidth 20MHz and PSD -1 dBm/MHz, 12 dBm is adopted.

[1] https://cdn.www.gob.pe/uploads/document/file/1861732/Resoluci%C3%B3n%20Ministerial%20nro%20373-2021-MTC/01.pdf

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
v2:
  - explain how induce how we induce 12 dBm from PSD -1 dBm/MHz in commit
    message
---
 db.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db.txt b/db.txt
index 5cada55b51eb..1e0a14b8670f 100644
--- a/db.txt
+++ b/db.txt
@@ -1443,12 +1443,15 @@ country PA: DFS-FCC
 	(5725 - 5850 @ 80), (36)
 	(57000 - 64000 @ 2160), (43)
 
+# Source:
+# https://cdn.www.gob.pe/uploads/document/file/1861732/Resoluci%C3%B3n%20Ministerial%20nro%20373-2021-MTC/01.pdf
 country PE: DFS-FCC
 	(2402 - 2482 @ 40), (20)
 	(5170 - 5250 @ 80), (17), AUTO-BW
 	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
 	(5490 - 5730 @ 160), (24), DFS
 	(5735 - 5835 @ 80), (30)
+	(5925 - 7125 @ 320), (12), NO-OUTDOOR
 
 country PF: DFS-ETSI
 	(2402 - 2482 @ 40), (20)
-- 
2.25.1



From pkshih at gmail.com  Thu Jul 18 20:23:24 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri, 19 Jul 2024 11:23:24 +0800
Subject: [PATCH v2 3/5] wireless-regdb: Update regulatory info for El Salvador (SV) on 6GHz
In-Reply-To: <20240719032326.7353-1-pkshih@gmail.com>
References: <20240719032326.7353-1-pkshih@gmail.com>
Message-ID: <20240719032326.7353-3-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

The General Superintendency of Electricity and Telecommunications Makes
Knowledge to the General issued resolution No. T-0408-2023.

Free use within the entire band for WLAN (WiFi) application, from
5925 MHz to 7125 MHz, must have following technical and operation
conditions:
 - access point
   * P.I.R.E 30 dBm
   * spectral density of P.I.R.E. 5 dBm/Mhz
 - client
   * P.I.R.E 24 dBm
   * spectral density of P.I.R.E. -1 dBm/Mhz
 - Indoor use only permitted

With minimum bandwidth 20MHz and PSD -1 dBm/MHz, 12 dBm is adopted.

[1] https://www.siget.gob.sv/actualizacion-de-cuadro-nacional-de-atribucion-de-frecuencias-t-0408-2023/

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
v2:
  - explain how induce how we induce 12 dBm from PSD -1 dBm/MHz in commit
    message
---
 db.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db.txt b/db.txt
index 1e0a14b8670f..31a051f242e5 100644
--- a/db.txt
+++ b/db.txt
@@ -1736,11 +1736,14 @@ country SR: DFS-ETSI
 	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
 	(5490 - 5710 @ 160), (27), DFS
 
+# Source:
+# https://www.siget.gob.sv/actualizacion-de-cuadro-nacional-de-atribucion-de-frecuencias-t-0408-2023/
 country SV: DFS-FCC
 	(2402 - 2482 @ 40), (20)
 	(5170 - 5250 @ 20), (17)
 	(5250 - 5330 @ 20), (23), DFS
 	(5735 - 5835 @ 20), (30)
+	(5925 - 7125 @ 320), (12), NO-OUTDOOR
 
 country SY:
 	(2402 - 2482 @ 40), (20)
-- 
2.25.1



From pkshih at gmail.com  Thu Jul 18 20:23:25 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri, 19 Jul 2024 11:23:25 +0800
Subject: [PATCH v2 4/5] wireless-regdb: Update regulatory info for Togo (TG) for 2022
In-Reply-To: <20240719032326.7353-1-pkshih@gmail.com>
References: <20240719032326.7353-1-pkshih@gmail.com>
Message-ID: <20240719032326.7353-4-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

Republic ToGolaise released Decision N 226/ARCEP/DG/22.

2400-2483.5 MHz
  - EIRP 100 mW and 10 mW/MHz density
5150-5350 MHz
  - EIRP 200 mW
  - If TPC is not used, must be reduced by 3 dB
5470-5850 MHz
  - EIRP 1W
  - If TPC is not used, must be reduced by 3 dB
5925-6425 MHz
  - LPI
    * EIRP 23 dBm (200 mW)
    * EIRP density 10 dBm/MHz
     (Reference [1] suggest this as -10 dBm/MHz, but this would be an error,
      becase PSD of LPI should not be lower than VLP.)
    * Use limited to indoor
  - VLP
    * EIRP 14 dBm (25 mW)
    * EIRP density -1 dBm/MHz
57-66 GHz
  - EIRP 40 dBm and 13 dBm/MHz density

[1] https://arcep.tg/wp-content/uploads/2022/12/Decision-226-22-Determinant-les-categories-et-conditions-techniques-dexploitation-des-appareils-de-faible-puissance-et-de-faible-portee.pdf

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
v2:
  - in commit message, describe typo that 5925-6425 LPI should be EIRP
    density 10 dBm/MHz. Otherwise, PSD for LPI is lower than VLP.
  - add DFS for all bands
  - not split 5150 - 5350 band, and set bandwidth to 80 MHz
  - set bandwidth 160 MHz for 5470 - 5850
---
 db.txt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/db.txt b/db.txt
index 31a051f242e5..b5e40e038d77 100644
--- a/db.txt
+++ b/db.txt
@@ -1763,11 +1763,14 @@ country TD: DFS-ETSI
 	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
 	(5490 - 5710 @ 160), (27), DFS
 
+# Source:
+# https://arcep.tg/wp-content/uploads/2022/12/Decision-226-22-Determinant-les-categories-et-conditions-techniques-dexploitation-des-appareils-de-faible-puissance-et-de-faible-portee.pdf
 country TG: DFS-ETSI
-	(2402 - 2482 @ 40), (20)
-	(5170 - 5250 @ 40), (20)
-	(5250 - 5330 @ 40), (20), DFS
-	(5490 - 5710 @ 40), (27), DFS
+	(2400 - 2483.5 @ 40), (100 mW), DFS
+	(5150 - 5350 @ 80), (20), DFS
+	(5470 - 5850 @ 160), (27), DFS
+	(5925 - 6425 @ 320), (23), DFS, NO-OUTDOOR
+	(57000 - 66000 @2160), (40), DFS
 
 # Source:
 # https://ratchakitcha.soc.go.th/documents/140D100S0000000004000.pdf
-- 
2.25.1



From pkshih at gmail.com  Thu Jul 18 20:23:26 2024
From: pkshih at gmail.com (Ping-Ke Shih)
Date: Fri, 19 Jul 2024 11:23:26 +0800
Subject: [PATCH v2 5/5] wireless-regdb: Add regulatory info for Namibia (NA) for 2023
In-Reply-To: <20240719032326.7353-1-pkshih@gmail.com>
References: <20240719032326.7353-1-pkshih@gmail.com>
Message-ID: <20240719032326.7353-5-pkshih@gmail.com>

From: Ping-Ke Shih <pkshih at realtek.com>

COMMUNICATIONS REGULATORY AUTHORITY OF NAMIBIA released NOTICE IN TERMS OF
THE REGULATIONS REGARDING THE SUBMISSIONS OF INTERCONNECTION AGREEMENTS
AND TARIFFS on 3 April 2023 [1].

* 2400-2483.5 MHz
  100 mW e.i.r.p.

* 5150-5350 MHz
  200 mW mean e.i.r.p.
  Restricted to indoor use
  The maximum mean e.i.r.p. density shall be limited to 10 mW/MHz
  (ETSI [2]: 200mW (23dBm) -3 dBm to be 20 dBm; DFS 5250-5350)

* 5470-5725 MHz
  250 mW e.i.r.p.
  Indoor as well as outdoor use allowed.
  The maximum mean e.i.r.p. density shall be limited to 50 mW/MHz
  (ETSI [2]: 250mW (24dBm) -3 dBm to be 21 dBm; DFS)

* 5725-5875 MHz
  PTP/PTMP: max mean e.i.r.p = 4 W
  Mesh/AP-MP: max mean e.i.r.p = 2 W
  (ETSI [3]: The FWA device shall have the capability to reduce the
   operating mean EIRP level to a level not exceeding 24 dBm for
   ChS = 20 MHz and 21 dBm for ChS = 10 MHz. 24 dBm is adopted; DFS)

* 5925-6425 MHz
  - 23 dBm (200mW) mean e.i.r.p
    Restricted to indoor use only.
    Mean e.i.r.p density for in-band emissions = 10 dBm/MHz
  - 14 dBm (25) e.i.r.p mW
    Very Low Power (VLP) indoor outdoor use.
    Maximum mean e.i.r.p. for inband emissions = 1 dBm/MHz

* 57-66 GHz
  40 dBm (10W) mean e.i.r.p
  23 dBm/MHz e.i.r.p. density
  Indoor use only

The EN 301 893 [2] specifies reduced power limit of 23 and 27 dBm for
5150-5350 MHz and 5470-5725 MHz respectively for devices that don't
implement TPC. Also reduced TPC requires being able to reduce TX power by
up to 3 dB. The DFS applicable frequency range are 5250-5350 MHz and
5470-5725 MHz.

[1] https://www.cran.na/yglilidy/2023/04/GG-8060-dated-3-April-2023.pdf
[2] EN 301 893 https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
[3] EN 302 502 https://www.etsi.org/deliver/etsi_en/302500_302599/302502/02.01.01_60/en_302502v020101p.pdf

Signed-off-by: Ping-Ke Shih <pkshih at realtek.com>
---
v2:
  - join to the same patchset
  - 5150-5350 and 5470-5725 only reduce 3dB due to TPC
  - 5725-5875 requires DFS
  - fix wording in commit message:
    * '5725-5 875 MHz' --> '5725-5875 MHz'
    * '10 dBM/MHz' --> '10 dBm/MHz'
    * 'Maximum meand e.i.r.p.' --> 'Maximum mean e.i.r.p' (drop extra 'd')
---
 db.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/db.txt b/db.txt
index b5e40e038d77..4eaeaae616d8 100644
--- a/db.txt
+++ b/db.txt
@@ -1355,6 +1355,17 @@ country MY: DFS-FCC
 	(5735 - 5835 @ 80), (1000 mW)
 	(5925 - 6425 @ 320), (200 mW), NO-OUTDOOR
 
+# Source:
+# https://www.cran.na/yglilidy/2023/04/GG-8060-dated-3-April-2023.pdf
+country NA: DFS-ETSI
+	(2400 - 2483.5 @ 40), (100 mW)
+	(5150 - 5250 @ 80), (20), AUTO-BW, NO-OUTDOOR
+	(5250 - 5350 @ 80), (20), DFS, AUTO-BW, NO-OUTDOOR
+	(5470 - 5725 @ 160), (21), DFS
+	(5725 - 5875 @ 80), (24), DFS
+	(5925 - 6425 @ 320), (23), NO-OUTDOOR
+	(57000 - 66000 @ 2160), (40), NO-OUTDOOR
+
 country NG: DFS-ETSI
 	(2402 - 2482 @ 40), (20)
 	(5250 - 5330 @ 80), (30), DFS
-- 
2.25.1



